From a63db042a1573d899fa849337d9b8de75934b3cb Mon Sep 17 00:00:00 2001
From: Tawakalt <olaniyitaiwo95@yahoo.com>
Date: Tue, 13 Feb 2024 17:37:29 +0100
Subject: [PATCH] implement PR feedback

---
 .../instrumentation/instrumentation.py        |  4 ++--
 .../{trace_provider.py => tracer_register.py} |  2 +-
 .../instrumentation/test_action_executor.py   | 13 ++++++------
 tests/tracing/test_trace_provider.py          | 19 -----------------
 tests/tracing/test_tracer_register.py         | 21 +++++++++++++++++++
 5 files changed, 31 insertions(+), 28 deletions(-)
 rename rasa_sdk/tracing/{trace_provider.py => tracer_register.py} (90%)
 delete mode 100644 tests/tracing/test_trace_provider.py
 create mode 100644 tests/tracing/test_tracer_register.py

diff --git a/rasa_sdk/tracing/instrumentation/instrumentation.py b/rasa_sdk/tracing/instrumentation/instrumentation.py
index 5adcaa18a..f28fd2b40 100644
--- a/rasa_sdk/tracing/instrumentation/instrumentation.py
+++ b/rasa_sdk/tracing/instrumentation/instrumentation.py
@@ -17,7 +17,7 @@
 from rasa_sdk.executor import ActionExecutor
 from rasa_sdk.forms import ValidationAction
 from rasa_sdk.tracing.instrumentation import attribute_extractors
-from rasa_sdk.tracing.trace_provider import TraceProvider
+from rasa_sdk.tracing.tracer_register import ActionExecutorTracerRegister
 
 # The `TypeVar` representing the return type for a function to be wrapped.
 S = TypeVar("S")
@@ -141,7 +141,7 @@ def instrument(
             attribute_extractors.extract_attrs_for_action_executor,
         )
         mark_class_as_instrumented(action_executor_class)
-        TraceProvider().register_tracer(tracer)
+        ActionExecutorTracerRegister().register_tracer(tracer)
 
     if validation_action_class is not None and not class_is_instrumented(
         validation_action_class
diff --git a/rasa_sdk/tracing/trace_provider.py b/rasa_sdk/tracing/tracer_register.py
similarity index 90%
rename from rasa_sdk/tracing/trace_provider.py
rename to rasa_sdk/tracing/tracer_register.py
index c5a599bab..0fd5b3f0f 100644
--- a/rasa_sdk/tracing/trace_provider.py
+++ b/rasa_sdk/tracing/tracer_register.py
@@ -3,7 +3,7 @@
 from opentelemetry.trace import Tracer
 
 
-class TraceProvider(metaclass=Singleton):
+class ActionExecutorTracerRegister(metaclass=Singleton):
     """Represents a provider for tracer."""
 
     tracer: Optional[Tracer] = None
diff --git a/tests/tracing/instrumentation/test_action_executor.py b/tests/tracing/instrumentation/test_action_executor.py
index 04006596b..05ab9f44c 100644
--- a/tests/tracing/instrumentation/test_action_executor.py
+++ b/tests/tracing/instrumentation/test_action_executor.py
@@ -11,7 +11,7 @@
 from tests.tracing.instrumentation.conftest import MockActionExecutor
 from rasa_sdk.types import ActionCall
 from rasa_sdk import Tracker
-from rasa_sdk.tracing.trace_provider import TraceProvider
+from rasa_sdk.tracing.tracer_register import ActionExecutorTracerRegister
 
 
 @pytest.mark.parametrize(
@@ -62,8 +62,7 @@ async def test_tracing_action_executor_run(
     assert captured_span.attributes == expected
 
 
-@pytest.mark.asyncio
-async def test_instrument_action_executor_run_registers_tracer(
+def test_instrument_action_executor_run_registers_tracer(
     tracer_provider: TracerProvider, monkeypatch: MonkeyPatch
 ) -> None:
     component_class = MockActionExecutor
@@ -73,8 +72,10 @@ async def test_instrument_action_executor_run_registers_tracer(
     register_tracer_mock = Mock()
     get_tracer_mock = Mock(return_value=mock_tracer)
 
-    monkeypatch.setattr(TraceProvider, "register_tracer", register_tracer_mock())
-    monkeypatch.setattr(TraceProvider, "get_tracer", get_tracer_mock)
+    monkeypatch.setattr(
+        ActionExecutorTracerRegister, "register_tracer", register_tracer_mock()
+    )
+    monkeypatch.setattr(ActionExecutorTracerRegister, "get_tracer", get_tracer_mock)
 
     instrumentation.instrument(
         tracer_provider,
@@ -82,7 +83,7 @@ async def test_instrument_action_executor_run_registers_tracer(
     )
     register_tracer_mock.assert_called_once()
 
-    provider = TraceProvider()
+    provider = ActionExecutorTracerRegister()
     tracer = provider.get_tracer()
 
     assert tracer is not None
diff --git a/tests/tracing/test_trace_provider.py b/tests/tracing/test_trace_provider.py
deleted file mode 100644
index 8400f0a51..000000000
--- a/tests/tracing/test_trace_provider.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from rasa_sdk.tracing.trace_provider import TraceProvider
-from opentelemetry import trace
-
-
-def test_anonymization_pipeline_provider_is_singleton() -> None:
-    trace_provider_1 = TraceProvider()
-    trace_provider_2 = TraceProvider()
-
-    assert trace_provider_1 is trace_provider_2
-    assert trace_provider_1.tracer is trace_provider_2.tracer
-
-
-def test_trace_provider() -> None:
-    trace_provider = TraceProvider()
-    tracer = trace.get_tracer(__name__)
-    trace_provider.register_tracer(tracer)
-
-    assert trace_provider.tracer == tracer
-    assert trace_provider.get_tracer() == tracer
diff --git a/tests/tracing/test_tracer_register.py b/tests/tracing/test_tracer_register.py
new file mode 100644
index 000000000..b547e144c
--- /dev/null
+++ b/tests/tracing/test_tracer_register.py
@@ -0,0 +1,21 @@
+from rasa_sdk.tracing.tracer_register import ActionExecutorTracerRegister
+from opentelemetry import trace
+
+
+def test_tracer_register_is_singleton() -> None:
+    tracer_register_1 = ActionExecutorTracerRegister()
+    tracer_register_2 = ActionExecutorTracerRegister()
+
+    assert tracer_register_1 is tracer_register_2
+    assert tracer_register_1.tracer is tracer_register_2.tracer
+
+
+def test_trace_register() -> None:
+    tracer_register = ActionExecutorTracerRegister()
+    assert tracer_register.get_tracer() is None
+
+    tracer = trace.get_tracer(__name__)
+    tracer_register.register_tracer(tracer)
+
+    assert tracer_register.tracer == tracer
+    assert tracer_register.get_tracer() == tracer