omnata-plugin-runtime 0.7.0a184__py3-none-any.whl → 0.8.0a186__py3-none-any.whl

omnata_plugin_runtime/logging.py

@@ -4,12 +4,38 @@ Custom logging functionality for Omnata
 import logging
 import logging.handlers
 import traceback
-from logging import Logger
+from logging import Logger, getLogger
 from typing import Dict, List, Optional
 from snowflake.snowpark import Session
 from pydantic import ValidationError
+from opentelemetry import trace
 
 
+class CustomLoggerAdapter(logging.LoggerAdapter):
+    """
+    A logger adapter which attaches current trace and span IDs to log messages, so that they can be correlated to traces.
+    Also offers the ability to add static extras.
+    """
+    def __init__(self, logger:logging.Logger, extra):
+        super(CustomLoggerAdapter, self).__init__(logger, extra)
+        self.extra_extras = {}
+    
+    def add_extra(self, key, value):
+        self.extra_extras[key] = value
+
+    def process(self, msg, kwargs):
+        extra = kwargs.get("extra", {})
+        current_span = trace.get_current_span()
+        context = current_span.get_span_context() if current_span is not None else None
+        if context is not None:
+            extra["trace_id"] = format(context.trace_id, 'x') # format as hex string to be consistent with Snowflake's handler
+            extra["span_id"] = format(context.span_id, 'x')
+        extra.update(self.extra_extras)
+        kwargs["extra"] = extra
+        return msg, kwargs
+
+logger = CustomLoggerAdapter(getLogger("omnata_plugin"), {})
+
 def log_exception(exception: Exception, logger_instance: Logger):
     """
     Logs an exception to a logger

omnata_plugin_runtime/plugin_entrypoints.py

@@ -395,7 +395,7 @@ class PluginEntrypoint:
     def connection_form(self,connectivity_option: str):
         connectivity_option = TypeAdapter(ConnectivityOption).validate_python(connectivity_option)
         logger.info("Entered connection_form method")
-        if self._plugin_instance.connection_form.connection_form.__code__.co_argcount==1:
+        if self._plugin_instance.connection_form.__code__.co_argcount==1:
             form: List[ConnectionMethod] = self._plugin_instance.connection_form()
         else:
             form: List[ConnectionMethod] = self._plugin_instance.connection_form(connectivity_option)

{omnata_plugin_runtime-0.7.0a184.dist-info → omnata_plugin_runtime-0.8.0a186.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.7.0a184
+Version: 0.8.0a186
 Summary: Classes and common runtime components for building and running Omnata Plugins
 Author: James Weakley
 Author-email: james.weakley@omnata.com
@@ -19,9 +19,11 @@ Requires-Dist: idna (<=3.7)
 Requires-Dist: jinja2 (>=3.1.2,<=3.1.4)
 Requires-Dist: markupsafe (<=2.1.3)
 Requires-Dist: numpy (<1.27.0)
+Requires-Dist: opentelemetry-api (<=1.23.0)
 Requires-Dist: packaging (<=24.1)
 Requires-Dist: pandas (<=2.2.2)
 Requires-Dist: platformdirs (<=3.10.0)
+Requires-Dist: protobuf (<=4.25.3)
 Requires-Dist: pyarrow (<=16.1.0)
 Requires-Dist: pycparser (<=2.21)
 Requires-Dist: pydantic (>=2,<=2.8.2)
@@ -34,10 +36,12 @@ Requires-Dist: requests (>=2,<=2.32.3)
 Requires-Dist: setuptools (<=72.1.0)
 Requires-Dist: snowflake-connector-python (>=3,<=3.12.0)
 Requires-Dist: snowflake-snowpark-python (==1.23.0)
+Requires-Dist: snowflake-telemetry-python (<=0.5.0)
 Requires-Dist: tenacity (>=8,<=8.2.3)
 Requires-Dist: tomlkit (<=0.11.1)
 Requires-Dist: urllib3 (<=2.2.2)
 Requires-Dist: wheel (<=0.43.0)
+Requires-Dist: wrapt (<=1.14.1)
 Description-Content-Type: text/markdown
 
 # omnata-plugin-runtime

{omnata_plugin_runtime-0.7.0a184.dist-info → omnata_plugin_runtime-0.8.0a186.dist-info}/RECORD

@@ -2,11 +2,11 @@ omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTw
 omnata_plugin_runtime/api.py,sha256=tVi4KLL0v5N3yz3Ie0kSyFemryu572gCbtSRfWN6wBU,6523
 omnata_plugin_runtime/configuration.py,sha256=Yyz3trj7G6nh3JyEw6S5qlrXUfS_MB-vZgATcNdWzp0,38339
 omnata_plugin_runtime/forms.py,sha256=ueodN2GIMS5N9fqebpY4uNGJnjEb9HcuaVQVfWH-cGg,19838
-omnata_plugin_runtime/logging.py,sha256=bn7eKoNWvtuyTk7RTwBS9UARMtqkiICtgMtzq3KA2V0,3272
+omnata_plugin_runtime/logging.py,sha256=u_Bo2v4jS3C_2E_Y8a7yfZZcIP-h5Mak_FPnFHUwFbU,4378
 omnata_plugin_runtime/omnata_plugin.py,sha256=aggjb_CTTjhgqjS8CHPOm4ENU0jNcYoT6LC8yI1IeF4,130048
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=Ulu4udC4tfCH-EA3VGXAT_WKHw5yZ6_ulsL7SjAN0qo,28953
+omnata_plugin_runtime/plugin_entrypoints.py,sha256=spCatkTxRX0WAgX0wqZP_vUF4Z-uOF8SrASuO3HXT1o,28937
 omnata_plugin_runtime/rate_limiting.py,sha256=JukA0l7x7Klqz2b54mR-poP7NRxpUHgWSGp6h0B8u6Q,25612
-omnata_plugin_runtime-0.7.0a184.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.7.0a184.dist-info/METADATA,sha256=CsI5s6i4uyWKk2g6aUHbSHq9WXkclnRVQL3rDQ7rY4s,1985
-omnata_plugin_runtime-0.7.0a184.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-omnata_plugin_runtime-0.7.0a184.dist-info/RECORD,,
+omnata_plugin_runtime-0.8.0a186.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.8.0a186.dist-info/METADATA,sha256=WKzsrVmekpQkDTx8mpKCEj67DG0FTtjFWqrJCbwEsXo,2148
+omnata_plugin_runtime-0.8.0a186.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+omnata_plugin_runtime-0.8.0a186.dist-info/RECORD,,