haiway 0.16.0__tar.gz → 0.18.0__tar.gz

{haiway-0.16.0 → haiway-0.18.0}/Makefile

@@ -10,7 +10,7 @@ TESTS_PATH := tests
 -include .env
 
 ifndef UV_VERSION
-	UV_VERSION := 0.6.5
+	UV_VERSION := 0.7.2
 endif
 
 .PHONY: uv_check venv sync update format lint test release

{haiway-0.16.0 → haiway-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haiway
-Version: 0.16.0
+Version: 0.18.0
 Summary: Framework for dependency injection and state management within structured concurrency model.
 Project-URL: Homepage, https://miquido.com
 Project-URL: Repository, https://github.com/miquido/haiway.git
@@ -35,12 +35,16 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Provides-Extra: dev
-Requires-Dist: bandit~=1.7; extra == 'dev'
+Requires-Dist: bandit~=1.8; extra == 'dev'
 Requires-Dist: pyright~=1.1; extra == 'dev'
-Requires-Dist: pytest-asyncio~=0.23; extra == 'dev'
-Requires-Dist: pytest-cov~=4.1; extra == 'dev'
-Requires-Dist: pytest~=7.4; extra == 'dev'
+Requires-Dist: pytest-asyncio~=0.26; extra == 'dev'
+Requires-Dist: pytest-cov~=6.1; extra == 'dev'
+Requires-Dist: pytest~=8.3; extra == 'dev'
 Requires-Dist: ruff~=0.11; extra == 'dev'
+Provides-Extra: opentelemetry
+Requires-Dist: opentelemetry-api; extra == 'opentelemetry'
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc; extra == 'opentelemetry'
+Requires-Dist: opentelemetry-sdk; extra == 'opentelemetry'
 Description-Content-Type: text/markdown
 
 # 🚗 haiway 🚕 🚚 🚙

haiway-0.18.0/junit/test-results.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="88" time="1.122" timestamp="2025-05-12T14:08:49.319975+00:00" hostname="pkrvmberfyhpb9w"><testcase classname="tests.test_async_queue" name="test_fails_when_stream_fails" time="0.001" /><testcase classname="tests.test_async_queue" name="test_cancels_when_iteration_cancels" time="0.001" /><testcase classname="tests.test_async_queue" name="test_ends_when_stream_ends" time="0.001" /><testcase classname="tests.test_async_queue" name="test_buffers_values_when_not_reading" time="0.001" /><testcase classname="tests.test_async_queue" name="test_delivers_buffer_when_streaming_fails" time="0.001" /><testcase classname="tests.test_async_queue" name="test_delivers_updates_when_sending" time="0.001" /><testcase classname="tests.test_async_queue" name="test_fails_when_sending_to_finished" time="0.001" /><testcase classname="tests.test_async_queue" name="test_ignores_when_finishing_when_finished" time="0.001" /><testcase classname="tests.test_async_stream" name="test_fails_when_stream_fails" time="0.001" /><testcase classname="tests.test_async_stream" name="test_cancels_when_iteration_cancels" time="0.001" /><testcase classname="tests.test_async_stream" name="test_ends_when_stream_ends" time="0.001" /><testcase classname="tests.test_async_stream" name="test_finishes_without_buffer" time="0.001" /><testcase classname="tests.test_async_stream" name="test_fails_without_buffer" time="0.001" /><testcase classname="tests.test_async_stream" name="test_delivers_updates_when_sending" time="0.001" /><testcase classname="tests.test_async_stream" name="test_ignores_when_sending_to_finished" time="0.001" /><testcase classname="tests.test_async_stream" name="test_ignores_when_sending_to_failed" time="0.001" /><testcase classname="tests.test_async_stream" name="test_ignores_when_finishing_when_finished" time="0.001" /><testcase classname="tests.test_async_stream" name="test_delivers_all_when_sending_async" time="0.001" /><testcase classname="tests.test_attribute_path" name="test_id_path_points_to_self" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_attribute_path_points_to_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_nested_attribute_path_points_to_nested_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_recursive_attribute_path_points_to_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_list_item_path_points_to_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_tuple_item_path_points_to_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_mixed_tuple_item_path_points_to_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_dict_item_path_points_to_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_id_path_set_updates_self" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_attribute_path_set_updates_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_nested_attribute_path_set_updates_nested_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_recursive_attribute_set_updates_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_list_item_path_set_updates_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_tuple_item_path_set_updates_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_mixed_tuple_item_set_updates_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_dict_item_path_set_updates_item" time="0.000" /><testcase classname="tests.test_auto_retry" name="test_returns_value_without_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_retries_with_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_logs_issue_with_errors" time="0.007" /><testcase classname="tests.test_auto_retry" name="test_fails_with_exceeding_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_fails_with_cancellation" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_retries_with_selected_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_fails_with_not_selected_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_returns_value_without_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_retries_with_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_fails_with_exceeding_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_fails_with_cancellation" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_fails_when_cancelled" time="0.021" /><testcase classname="tests.test_auto_retry" name="test_async_uses_delay_with_errors" time="0.102" /><testcase classname="tests.test_auto_retry" name="test_async_uses_computed_delay_with_errors" time="0.107" /><testcase classname="tests.test_auto_retry" name="test_async_logs_issue_with_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_retries_with_selected_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_fails_with_not_selected_errors" time="0.001" /><testcase classname="tests.test_cache" name="test_returns_cache_value_with_same_argument" time="0.001" /><testcase classname="tests.test_cache" name="test_returns_fresh_value_with_different_argument" time="0.001" /><testcase classname="tests.test_cache" name="test_returns_fresh_value_with_limit_exceed" time="0.001" /><testcase classname="tests.test_cache" name="test_returns_same_value_with_repeating_argument" time="0.001" /><testcase classname="tests.test_cache" name="test_fails_with_error" time="0.001" /><testcase classname="tests.test_cache" name="test_returns_fresh_value_with_expiration_time_exceed" time="0.021" /><testcase classname="tests.test_cache" name="test_async_returns_cache_value_with_same_argument" time="0.001" /><testcase classname="tests.test_cache" name="test_async_returns_fresh_value_with_different_argument" time="0.001" /><testcase classname="tests.test_cache" name="test_async_returns_fresh_value_with_limit_exceed" time="0.001" /><testcase classname="tests.test_cache" name="test_async_returns_same_value_with_repeating_argument" time="0.001" /><testcase classname="tests.test_cache" name="test_async_returns_fresh_value_with_expiration_time_exceed" time="0.021" /><testcase classname="tests.test_cache" name="test_async_cancel_waiting_does_not_cancel_task" time="0.502" /><testcase classname="tests.test_cache" name="test_async_expiration_does_not_cancel_task" time="0.021" /><testcase classname="tests.test_cache" name="test_async_fails_with_error" time="0.001" /><testcase classname="tests.test_context" name="test_state_is_available_according_to_context" time="0.001" /><testcase classname="tests.test_context" name="test_state_update_updates_local_context" time="0.001" /><testcase classname="tests.test_context" name="test_exceptions_are_propagated" time="0.001" /><testcase classname="tests.test_state" name="test_basic_initializes_with_arguments" time="0.002" /><testcase classname="tests.test_state" name="test_basic_initializes_with_defaults" time="0.001" /><testcase classname="tests.test_state" name="test_basic_equals_checks_properties" time="0.000" /><testcase classname="tests.test_state" name="test_basic_initializes_with_arguments_and_defaults" time="0.000" /><testcase classname="tests.test_state" name="test_parametrized_initializes_with_proper_parameters" time="0.000" /><testcase classname="tests.test_state" name="test_nested_initializes_with_proper_arguments" time="0.001" /><testcase classname="tests.test_state" name="test_dict_skips_missing_properties" time="0.000" /><testcase classname="tests.test_state" name="test_initialization_allows_missing_properties" time="0.000" /><testcase classname="tests.test_state" name="test_generic_subtypes_validation" time="0.002" /><testcase classname="tests.test_state" name="test_copying_leaves_same_object" time="0.000" /><testcase classname="tests.test_streaming" name="test_fails_when_generator_fails" time="0.001" /><testcase classname="tests.test_streaming" name="test_cancels_when_iteration_cancels" time="0.001" /><testcase classname="tests.test_streaming" name="test_ends_when_generator_ends" time="0.001" /><testcase classname="tests.test_streaming" name="test_delivers_updates_when_generating" time="0.001" /><testcase classname="tests.test_streaming" name="test_streaming_context_variables_access_is_preserved" time="0.001" /><testcase classname="tests.test_streaming" name="test_nested_streaming_streams_correctly" time="0.001" /><testcase classname="tests.test_timeout" name="test_returns_result_when_returning_value" time="0.001" /><testcase classname="tests.test_timeout" name="test_raises_with_error" time="0.001" /><testcase classname="tests.test_timeout" name="test_raises_with_cancel" time="0.011" /><testcase classname="tests.test_timeout" name="test_raises_with_timeout" time="0.011" /></testsuite></testsuites>

{haiway-0.16.0 → haiway-0.18.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 name = "haiway"
 description = "Framework for dependency injection and state management within structured concurrency model."
-version = "0.16.0"
+version = "0.18.0"
 readme = "README.md"
 maintainers = [
   { name = "Kacper Kaliński", email = "kacper.kalinski@miquido.com" },
@@ -27,14 +27,18 @@ Homepage = "https://miquido.com"
 Repository = "https://github.com/miquido/haiway.git"
 
 [project.optional-dependencies]
+opentelemetry = [
+  "opentelemetry-api",
+  "opentelemetry-sdk",
+  "opentelemetry-exporter-otlp-proto-grpc",
+]
 dev = [
-  "haiway",
-  "ruff~=0.11",
+  "bandit~=1.8",
   "pyright~=1.1",
-  "bandit~=1.7",
-  "pytest~=7.4",
-  "pytest-cov~=4.1",
-  "pytest-asyncio~=0.23",
+  "pytest~=8.3",
+  "pytest-asyncio~=0.26",
+  "pytest-cov~=6.1",
+  "ruff~=0.11",
 ]
 
 [tool.ruff]

{haiway-0.16.0 → haiway-0.18.0}/src/haiway/__init__.py

@@ -1,14 +1,16 @@
 from haiway.context import (
     Disposable,
     Disposables,
-    MetricsContext,
-    MetricsHandler,
-    MetricsReading,
-    MetricsRecording,
-    MetricsScopeEntering,
-    MetricsScopeExiting,
     MissingContext,
     MissingState,
+    Observability,
+    ObservabilityContext,
+    ObservabilityEventRecording,
+    ObservabilityLevel,
+    ObservabilityLogRecording,
+    ObservabilityMetricRecording,
+    ObservabilityScopeEntering,
+    ObservabilityScopeExiting,
     ScopeContext,
     ScopeIdentifier,
     StateContext,
@@ -16,8 +18,6 @@ from haiway.context import (
 )
 from haiway.helpers import (
     ArgumentsTrace,
-    MetricsHolder,
-    MetricsLogger,
     ResultTrace,
     asynchronous,
     cache,
@@ -61,7 +61,7 @@ from haiway.utils import (
     without_missing,
 )
 
-__all__ = [
+__all__ = (
     "MISSING",
     "ArgumentsTrace",
     "AsyncQueue",
@@ -72,17 +72,17 @@ __all__ = [
     "DefaultValue",
     "Disposable",
     "Disposables",
-    "MetricsContext",
-    "MetricsHandler",
-    "MetricsHolder",
-    "MetricsLogger",
-    "MetricsReading",
-    "MetricsRecording",
-    "MetricsScopeEntering",
-    "MetricsScopeExiting",
     "Missing",
     "MissingContext",
     "MissingState",
+    "Observability",
+    "ObservabilityContext",
+    "ObservabilityEventRecording",
+    "ObservabilityLevel",
+    "ObservabilityLogRecording",
+    "ObservabilityMetricRecording",
+    "ObservabilityScopeEntering",
+    "ObservabilityScopeExiting",
     "ResultTrace",
     "ScopeContext",
     "ScopeIdentifier",
@@ -118,4 +118,4 @@ __all__ = [
     "when_missing",
     "without_missing",
     "wrap_async",
-]
+)

haiway-0.18.0/src/haiway/context/__init__.py

@@ -0,0 +1,34 @@
+from haiway.context.access import ScopeContext, ctx
+from haiway.context.disposables import Disposable, Disposables
+from haiway.context.identifier import ScopeIdentifier
+from haiway.context.observability import (
+    Observability,
+    ObservabilityContext,
+    ObservabilityEventRecording,
+    ObservabilityLevel,
+    ObservabilityLogRecording,
+    ObservabilityMetricRecording,
+    ObservabilityScopeEntering,
+    ObservabilityScopeExiting,
+)
+from haiway.context.state import StateContext
+from haiway.context.types import MissingContext, MissingState
+
+__all__ = (
+    "Disposable",
+    "Disposables",
+    "MissingContext",
+    "MissingState",
+    "Observability",
+    "ObservabilityContext",
+    "ObservabilityEventRecording",
+    "ObservabilityLevel",
+    "ObservabilityLogRecording",
+    "ObservabilityMetricRecording",
+    "ObservabilityScopeEntering",
+    "ObservabilityScopeExiting",
+    "ScopeContext",
+    "ScopeIdentifier",
+    "StateContext",
+    "ctx",
+)

{haiway-0.16.0 → haiway-0.18.0}/src/haiway/context/access.py

@@ -18,17 +18,14 @@ from typing import Any, final, overload
 
 from haiway.context.disposables import Disposable, Disposables
 from haiway.context.identifier import ScopeIdentifier
-from haiway.context.logging import LoggerContext
-from haiway.context.metrics import MetricsContext, MetricsHandler
+from haiway.context.observability import Observability, ObservabilityContext, ObservabilityLevel
 from haiway.context.state import ScopeState, StateContext
 from haiway.context.tasks import TaskGroupContext
 from haiway.state import State
 from haiway.utils import mimic_function
 from haiway.utils.stream import AsyncStream
 
-__all__ = [
-    "ctx",
-]
+__all__ = ("ctx",)
 
 
 @final
@@ -36,8 +33,7 @@ class ScopeContext:
     __slots__ = (
         "_disposables",
         "_identifier",
-        "_logger_context",
-        "_metrics_context",
+        "_observability_context",
         "_state_context",
         "_task_group_context",
     )
@@ -45,11 +41,10 @@ class ScopeContext:
     def __init__(
         self,
         label: str,
-        logger: Logger | None,
         task_group: TaskGroup | None,
         state: tuple[State, ...],
         disposables: Disposables | None,
-        metrics: MetricsHandler | None,
+        observability: Observability | Logger | None,
     ) -> None:
         self._identifier: ScopeIdentifier
         object.__setattr__(
@@ -57,23 +52,6 @@ class ScopeContext:
             "_identifier",
             ScopeIdentifier.scope(label),
         )
-        self._logger_context: LoggerContext
-        object.__setattr__(
-            self,
-            "_logger_context",
-            LoggerContext(
-                self._identifier,
-                logger=logger,
-            ),
-        )
-        self._task_group_context: TaskGroupContext | None
-        object.__setattr__(
-            self,
-            "_task_group_context",
-            TaskGroupContext(task_group=task_group)
-            if task_group is not None or self._identifier.is_root
-            else None,
-        )
         # prepare state context to capture current state
         self._state_context: StateContext
         object.__setattr__(
@@ -87,16 +65,24 @@ class ScopeContext:
             "_disposables",
             disposables,
         )
-        self._metrics_context: MetricsContext
+        self._observability_context: ObservabilityContext
         object.__setattr__(
             self,
-            "_metrics_context",
-            # pre-building metrics context to ensure nested context registering
-            MetricsContext.scope(
+            "_observability_context",
+            # pre-building observability context to ensure nested context registering
+            ObservabilityContext.scope(
                 self._identifier,
-                metrics=metrics,
+                observability=observability,
             ),
         )
+        self._task_group_context: TaskGroupContext | None
+        object.__setattr__(
+            self,
+            "_task_group_context",
+            TaskGroupContext(task_group=task_group)
+            if task_group is not None or self._identifier.is_root
+            else None,
+        )
 
     def __setattr__(
         self,
@@ -123,9 +109,8 @@ class ScopeContext:
         ), "Can't enter synchronous context with task group"
         assert self._disposables is None, "Can't enter synchronous context with disposables"  # nosec: B101
         self._identifier.__enter__()
-        self._logger_context.__enter__()
+        self._observability_context.__enter__()
         self._state_context.__enter__()
-        self._metrics_context.__enter__()
 
         return self._identifier.trace_id
 
@@ -135,24 +120,16 @@ class ScopeContext:
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
     ) -> None:
-        self._metrics_context.__exit__(
-            exc_type=exc_type,
-            exc_val=exc_val,
-            exc_tb=exc_tb,
-        )
-
         self._state_context.__exit__(
             exc_type=exc_type,
             exc_val=exc_val,
             exc_tb=exc_tb,
         )
-
-        self._logger_context.__exit__(
+        self._observability_context.__exit__(
             exc_type=exc_type,
             exc_val=exc_val,
             exc_tb=exc_tb,
         )
-
         self._identifier.__exit__(
             exc_type=exc_type,
             exc_val=exc_val,
@@ -161,7 +138,7 @@ class ScopeContext:
 
     async def __aenter__(self) -> str:
         self._identifier.__enter__()
-        self._logger_context.__enter__()
+        self._observability_context.__enter__()
 
         if task_group := self._task_group_context:
             await task_group.__aenter__()
@@ -183,7 +160,6 @@ class ScopeContext:
             )
 
         self._state_context.__enter__()
-        self._metrics_context.__enter__()
 
         return self._identifier.trace_id
 
@@ -207,19 +183,13 @@ class ScopeContext:
                 exc_tb=exc_tb,
             )
 
-        self._metrics_context.__exit__(
-            exc_type=exc_type,
-            exc_val=exc_val,
-            exc_tb=exc_tb,
-        )
-
         self._state_context.__exit__(
             exc_type=exc_type,
             exc_val=exc_val,
             exc_tb=exc_tb,
         )
 
-        self._logger_context.__exit__(
+        self._observability_context.__exit__(
             exc_type=exc_type,
             exc_val=exc_val,
             exc_tb=exc_tb,
@@ -288,9 +258,8 @@ class ctx:
         /,
         *state: State,
         disposables: Disposables | Iterable[Disposable] | None = None,
-        logger: Logger | None = None,
         task_group: TaskGroup | None = None,
-        metrics: MetricsHandler | None = None,
+        observability: Observability | Logger | None = None,
     ) -> ScopeContext:
         """
         Prepare scope context with given parameters. When called within an existing context\
@@ -310,18 +279,14 @@ class ctx:
              be added to the scope state. Using asynchronous context is required if any disposables\
              were provided.
 
-        logger: Logger | None
-            logger used within the scope context, when not provided current logger will be used\
-             if any, otherwise the logger with the scope name will be requested.
-
         task_group: TaskGroup | None
             task group used for spawning and joining tasks within the context. Root scope will
              always have task group created even when not set.
 
-        metrics_store: MetricsStore | None = None
-            metrics storage solution responsible for recording and storing metrics.\
-             Metrics recroding will be ignored if storage is not provided.
-            Assigning metrics_store within existing context will result in an error.
+        observability: Observability | Logger | None = None
+            observability solution responsible for recording and storing metrics, logs and events.\
+             Assigning observability within existing context will result in an error.
+            When not provided, logger with the scope name will be requested and used.
 
         Returns
         -------
@@ -343,11 +308,10 @@ class ctx:
 
         return ScopeContext(
             label=label,
-            logger=logger,
             task_group=task_group,
             state=state,
             disposables=resolved_disposables,
-            metrics=metrics,
+            observability=observability,
         )
 
     @staticmethod
@@ -492,83 +456,6 @@ class ctx:
             default=default,
         )
 
-    @staticmethod
-    def record(
-        metric: State,
-        /,
-    ) -> None:
-        """
-        Record metric within current scope context.
-
-        Parameters
-        ----------
-        metric: State
-            value of metric to be recorded. When a metric implements __add__ it will be added to\
-             current value if any, otherwise subsequent calls may replace existing value.
-
-        Returns
-        -------
-        None
-        """
-
-        MetricsContext.record(metric)
-
-    @overload
-    @staticmethod
-    async def read[Metric: State](
-        metric: type[Metric],
-        /,
-        *,
-        merged: bool = False,
-    ) -> Metric | None: ...
-
-    @overload
-    @staticmethod
-    async def read[Metric: State](
-        metric: type[Metric],
-        /,
-        *,
-        merged: bool = False,
-        default: Metric,
-    ) -> Metric: ...
-
-    @staticmethod
-    async def read[Metric: State](
-        metric: type[Metric],
-        /,
-        *,
-        merged: bool = False,
-        default: Metric | None = None,
-    ) -> Metric | None:
-        """
-        Read metric within current scope context.
-
-        Parameters
-        ----------
-        metric: type[Metric]
-            type of metric to be read from current context.
-
-        merged: bool
-            control wheather to merge metrics from nested scopes (True)\
-             or access only the current scope value (False) without combining them
-
-        default: Metric | None
-            default value to return when metric was not recorded yet.
-
-        Returns
-        -------
-        Metric | None
-        """
-
-        value: Metric | None = await MetricsContext.read(
-            metric,
-            merged=merged,
-        )
-        if value is None:
-            return default
-
-        return value
-
     @staticmethod
     def log_error(
         message: str,
@@ -596,7 +483,8 @@ class ctx:
         None
         """
 
-        LoggerContext.log_error(
+        ObservabilityContext.record_log(
+            ObservabilityLevel.ERROR,
             message,
             *args,
             exception=exception,
@@ -629,7 +517,8 @@ class ctx:
         None
         """
 
-        LoggerContext.log_warning(
+        ObservabilityContext.record_log(
+            ObservabilityLevel.WARNING,
             message,
             *args,
             exception=exception,
@@ -658,9 +547,11 @@ class ctx:
         None
         """
 
-        LoggerContext.log_info(
+        ObservabilityContext.record_log(
+            ObservabilityLevel.INFO,
             message,
             *args,
+            exception=None,
         )
 
     @staticmethod
@@ -690,8 +581,65 @@ class ctx:
         None
         """
 
-        LoggerContext.log_debug(
+        ObservabilityContext.record_log(
+            ObservabilityLevel.DEBUG,
             message,
             *args,
             exception=exception,
         )
+
+    @staticmethod
+    def event(
+        event: State,
+        /,
+        *,
+        level: ObservabilityLevel = ObservabilityLevel.INFO,
+    ) -> None:
+        """
+        Record event within current scope context.
+
+        Parameters
+        ----------
+        event: State
+            contents of event to be recorded.
+
+        Returns
+        -------
+        None
+        """
+
+        ObservabilityContext.record_event(
+            event,
+            level=level,
+        )
+
+    @staticmethod
+    def metric(
+        metric: str,
+        /,
+        *,
+        value: float | int,
+        unit: str | None = None,
+    ) -> None:
+        """
+        Record metric within current scope context.
+
+        Parameters
+        ----------
+        metric: State
+            name of metric to be recorded.
+        value: float | int
+            value of metric to be recorded.
+        unit: str | None = None
+            unit of metric to be recorded.
+
+        Returns
+        -------
+        None
+        """
+
+        ObservabilityContext.record_metric(
+            metric,
+            value=value,
+            unit=unit,
+        )

{haiway-0.16.0 → haiway-0.18.0}/src/haiway/context/disposables.py

@@ -7,10 +7,10 @@ from typing import Any, final
 
 from haiway.state import State
 
-__all__ = [
+__all__ = (
     "Disposable",
     "Disposables",
-]
+)
 
 type Disposable = AbstractAsyncContextManager[Iterable[State] | State | None]
 

{haiway-0.16.0 → haiway-0.18.0}/src/haiway/context/identifier.py

@@ -3,9 +3,7 @@ from types import TracebackType
 from typing import Any, Self, final
 from uuid import uuid4
 
-__all__ = [
-    "ScopeIdentifier",
-]
+__all__ = ("ScopeIdentifier",)
 
 
 @final
@@ -33,10 +31,11 @@ class ScopeIdentifier:
         except LookupError:
             # create root scope when missing
             trace_id: str = uuid4().hex
+            scope_id: str = uuid4().hex
             return cls(
                 label=label,
-                scope_id=uuid4().hex,
-                parent_id=trace_id,  # trace_id is parent_id for root
+                scope_id=scope_id,
+                parent_id=scope_id,  # own id is parent_id for root
                 trace_id=trace_id,
             )