Change recording to create a span of type "record_root"

Makefile

@@ -28,15 +28,16 @@ env-%:
 
 env-tests:
 	poetry run pip install \
-		pytest \
+		jsondiff \
 		nbconvert \
 		nbformat \
-		pytest-subtests \
-		pytest-azurepipelines \
-		ruff \
+		opentelemetry-sdk \
 		pre-commit \
+		pytest \
+		pytest-azurepipelines \
 		pytest-cov \
-		jsondiff
+		pytest-subtests \
+		ruff \
 
 env-tests-required:
 	poetry install --only required \

examples/experimental/otel_exporter.ipynb

@@ -32,29 +32,18 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from typing import Callable\n",
+    "import logging\n",
     "\n",
-    "from opentelemetry import trace\n",
-    "from trulens.apps.custom import instrument\n",
-    "from trulens.experimental.otel_tracing.core.init import TRULENS_SERVICE_NAME\n",
-    "\n",
-    "\n",
-    "def decorator(func: Callable):\n",
-    "    tracer = trace.get_tracer(TRULENS_SERVICE_NAME)\n",
-    "\n",
-    "    def wrapper(*args, **kwargs):\n",
-    "        print(\"start wrap\")\n",
-    "\n",
-    "        with tracer.start_as_current_span(\"custom\"):\n",
-    "            result = func(*args, **kwargs)\n",
-    "            span = trace.get_current_span()\n",
-    "            print(\"---span---\")\n",
-    "            print(span.get_span_context())\n",
-    "            span.set_attribute(\"result\", result)\n",
-    "            span.set_status(trace.Status(trace.StatusCode.OK))\n",
-    "            return result\n",
-    "\n",
-    "    return wrapper"
+    "root = logging.getLogger()\n",
+    "root.setLevel(logging.DEBUG)\n",
+    "handler = logging.StreamHandler(sys.stdout)\n",
+    "handler.setLevel(logging.DEBUG)\n",
+    "handler.addFilter(logging.Filter(\"trulens\"))\n",
+    "formatter = logging.Formatter(\n",
+    "    \"%(asctime)s - %(name)s - %(levelname)s - %(message)s\"\n",
+    ")\n",
+    "handler.setFormatter(formatter)\n",
+    "root.addHandler(handler)"
    ]
   },
   {
@@ -63,22 +52,46 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from examples.dev.dummy_app.dummy import Dummy\n",
-    "\n",
+    "from trulens.experimental.otel_tracing.core.instrument import instrument\n",
     "\n",
-    "class TestApp(Dummy):\n",
-    "    def __init__(self):\n",
-    "        super().__init__()\n",
     "\n",
-    "    @decorator\n",
-    "    @instrument\n",
+    "class TestApp:\n",
+    "    @instrument()\n",
     "    def respond_to_query(self, query: str) -> str:\n",
     "        return f\"answer: {self.nested(query)}\"\n",
     "\n",
-    "    @decorator\n",
-    "    @instrument\n",
+    "    @instrument(attributes={\"nested_attr1\": \"value1\"})\n",
     "    def nested(self, query: str) -> str:\n",
-    "        return f\"nested: {query}\""
+    "        return f\"nested: {self.nested2(query)}\"\n",
+    "\n",
+    "    @instrument(\n",
+    "        attributes=lambda ret, exception, *args, **kwargs: {\n",
+    "            \"nested2_ret\": ret,\n",
+    "            \"nested2_args[0]\": args[0],\n",
+    "        }\n",
+    "    )\n",
+    "    def nested2(self, query: str) -> str:\n",
+    "        nested_result = \"\"\n",
+    "\n",
+    "        try:\n",
+    "            nested_result = self.nested3(query)\n",
+    "        except Exception:\n",
+    "            pass\n",
+    "\n",
+    "        return f\"nested2: {nested_result}\"\n",
+    "\n",
+    "    @instrument(\n",
+    "        attributes=lambda ret, exception, *args, **kwargs: {\n",
+    "            \"nested3_ex\": exception.args if exception else None,\n",
+    "            \"nested3_ret\": ret,\n",
+    "            \"selector_name\": \"special\",\n",
+    "            \"cows\": \"moo\",\n",
+    "        }\n",
+    "    )\n",
+    "    def nested3(self, query: str) -> str:\n",
+    "        if query == \"throw\":\n",
+    "            raise ValueError(\"nested3 exception\")\n",
+    "        return \"nested3\""
    ]
   },
   {
@@ -87,11 +100,16 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import dotenv\n",
     "from trulens.core.session import TruSession\n",
     "from trulens.experimental.otel_tracing.core.init import init\n",
     "\n",
+    "dotenv.load_dotenv()\n",
+    "\n",
     "session = TruSession()\n",
-    "init(session)"
+    "session.experimental_enable_feature(\"otel_tracing\")\n",
+    "session.reset_database()\n",
+    "init(session, debug=True)"
    ]
   },
   {
@@ -100,9 +118,16 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from trulens.apps.custom import TruCustomApp\n",
+    "\n",
     "test_app = TestApp()\n",
+    "custom_app = TruCustomApp(test_app)\n",
+    "\n",
+    "with custom_app as recording:\n",
+    "    test_app.respond_to_query(\"test\")\n",
     "\n",
-    "test_app.respond_to_query(\"test\")"
+    "with custom_app as recording:\n",
+    "    test_app.respond_to_query(\"throw\")"
    ]
   }
  ],

src/core/trulens/core/app.py

@@ -3,6 +3,7 @@
 from abc import ABC
 from abc import ABCMeta
 from abc import abstractmethod
+import contextlib
 import contextvars
 import datetime
 import inspect
@@ -421,6 +422,17 @@ def tru(self) -> core_connector.DBConnector:
         pydantic.PrivateAttr(default_factory=dict)
     )
 
+    token: Optional[object] = None
+    """
+    OTEL context token for the current context manager.
+    """
+
+    span_context: Optional[contextlib.AbstractContextManager] = None
+    """
+    Span context manager. Required to help keep track of the appropriate span context
+    to enter/exit.
+    """
+
     def __init__(
         self,
         connector: Optional[core_connector.DBConnector] = None,
@@ -1048,27 +1060,29 @@ def __enter__(self):
         if self.session.experimental_feature(
             core_experimental.Feature.OTEL_TRACING
         ):
-            from trulens.experimental.otel_tracing.core.app import _App
+            from trulens.experimental.otel_tracing.core.instrument import (
+                App as OTELApp,
+            )
 
-            return _App.__enter__(self)
+            return OTELApp.__enter__(self)
 
         ctx = core_instruments._RecordingContext(app=self)
 
         token = self.recording_contexts.set(ctx)
         ctx.token = token
 
-        # self._set_context_vars()
-
         return ctx
 
     # For use as a context manager.
     def __exit__(self, exc_type, exc_value, exc_tb):
         if self.session.experimental_feature(
             core_experimental.Feature.OTEL_TRACING
         ):
-            from trulens.experimental.otel_tracing.core.app import _App
+            from trulens.experimental.otel_tracing.core.instrument import (
+                App as OTELApp,
+            )
 
-            return _App.__exit__(self, exc_type, exc_value, exc_tb)
+            return OTELApp.__exit__(self, exc_type, exc_value, exc_tb)
 
         ctx = self.recording_contexts.get()
         self.recording_contexts.reset(ctx.token)
@@ -1085,9 +1099,11 @@ async def __aenter__(self):
         if self.session.experimental_feature(
             core_experimental.Feature.OTEL_TRACING
         ):
-            from trulens.experimental.otel_tracing.core.app import _App
+            from trulens.experimental.otel_tracing.core.instrument import (
+                App as OTELApp,
+            )
 
-            return await _App.__aenter__(self)
+            return OTELApp.__enter__(self)
 
         ctx = core_instruments._RecordingContext(app=self)
 
@@ -1103,9 +1119,11 @@ async def __aexit__(self, exc_type, exc_value, exc_tb):
         if self.session.experimental_feature(
             core_experimental.Feature.OTEL_TRACING
         ):
-            from trulens.experimental.otel_tracing.core.app import _App
+            from trulens.experimental.otel_tracing.core.instrument import (
+                App as OTELApp,
+            )
 
-            return await _App.__aexit__(self, exc_type, exc_value, exc_tb)
+            return OTELApp.__exit__(self, exc_type, exc_value, exc_tb)
 
         ctx = self.recording_contexts.get()
         self.recording_contexts.reset(ctx.token)

src/core/trulens/core/database/sqlalchemy.py

@@ -1044,6 +1044,7 @@ def get_datasets(self) -> pd.DataFrame:
 
     def insert_event(self, event: Event) -> types_schema.EventID:
         """See [DB.insert_event][trulens.core.database.base.DB.insert_event]."""
+
         with self.session.begin() as session:
             _event = self.orm.Event.parse(event, redact_keys=self.redact_keys)
             session.add(_event)