omnata-plugin-runtime 0.7.0a184__tar.gz → 0.8.0a186__tar.gz

{omnata_plugin_runtime-0.7.0a184 → omnata_plugin_runtime-0.8.0a186}/PKG-INFO

@@ -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 → omnata_plugin_runtime-0.8.0a186}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.7.0-a184"
+version = "0.8.0-a186"
 description = "Classes and common runtime components for building and running Omnata Plugins"
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"
@@ -38,6 +38,10 @@ wheel = "<=0.43.0" # latest version available on Snowflake Anaconda
 pyyaml = "<=6.0.1" # latest version available on Snowflake Anaconda
 cffi = "<=1.16.0" # latest version available on Snowflake Anaconda
 pyarrow = "<=16.1.0" # latest version available on Snowflake Anaconda
+wrapt = "<=1.14.1" # latest version available on Snowflake Anaconda
+opentelemetry-api = "<=1.23.0" # latest version available on Snowflake Anaconda
+snowflake-telemetry-python = "<=0.5.0" # latest version available on Snowflake Anaconda
+protobuf = "<=4.25.3" # latest version available on Snowflake Anaconda
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2.4"

{omnata_plugin_runtime-0.7.0a184 → omnata_plugin_runtime-0.8.0a186}/src/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-0.7.0a184 → omnata_plugin_runtime-0.8.0a186}/src/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)