Refactor decorator

Author: draincoder

src/asgi_monitor/tracing/decorator.py

@@ -15,23 +15,23 @@
 
 
 def _span_wrapper(
-    span_name: str | None,
+    name: str | None,
     attributes: Attributes | None,
     tracer: Tracer | None,
 ) -> Callable[[Func], Func]:
     def span_decorator(func: Func) -> Func:
-        name: str = span_name or func.__name__
+        name_ = name or func.__name__
         tracer_ = tracer or trace.get_tracer(__name__)
 
         @wraps(func)
         def sync_span_wrapper(*args: F_Spec.args, **kwargs: F_Spec.kwargs) -> F_Return:  # type: ignore[type-var]
-            with tracer_.start_as_current_span(name=name, attributes=attributes):
+            with tracer_.start_as_current_span(name=name_, attributes=attributes):
                 result = func(*args, **kwargs)
             return cast(F_Return, result)
 
         @wraps(func)
         async def async_span_wrapper(*args: F_Spec.args, **kwargs: F_Spec.kwargs) -> F_Return:
-            with tracer_.start_as_current_span(name=name, attributes=attributes):
+            with tracer_.start_as_current_span(name=name_, attributes=attributes):
                 result = await func(*args, **kwargs)
             return cast(F_Return, result)
 
@@ -46,7 +46,7 @@ async def async_span_wrapper(*args: F_Spec.args, **kwargs: F_Spec.kwargs) -> F_R
 def span(
     call: Func,
     *,
-    span_name: None = None,
+    name: None = None,
     attributes: None = None,
     tracer: None = None,
 ) -> Func: ...
@@ -56,7 +56,7 @@ def span(
 def span(
     call: None = None,
     *,
-    span_name: str | None = None,
+    name: str | None = None,
     attributes: Attributes | None = None,
     tracer: Tracer | None = None,
 ) -> Callable[[Func], Func]: ...
@@ -65,11 +65,11 @@ def span(
 def span(
     call: Func | None = None,
     *,
-    span_name: str | None = None,
+    name: str | None = None,
     attributes: Attributes | None = None,
     tracer: Tracer | None = None,
 ) -> Callable[[Func], Func] | Func:
-    wrap_decorator = _span_wrapper(span_name, attributes, tracer)
+    wrap_decorator = _span_wrapper(name, attributes, tracer)
     if call is None:
         return wrap_decorator
     else:

tests/unit/tracing/test_span_decorator.py

@@ -39,7 +39,7 @@ def action() -> None:
 
 def test_span_decorator(exporter: InMemorySpanExporter, tracer_provider: TracerProvider) -> None:
     # Arrange
-    @span_decorator(span_name="test", attributes={"test": "test"}, tracer=tracer_provider.get_tracer(__name__))
+    @span_decorator(name="test", attributes={"test": "test"}, tracer=tracer_provider.get_tracer(__name__))
     def action() -> None:
         time.sleep(0.01)
 
@@ -84,7 +84,7 @@ async def action() -> None:
 
 async def test_async_span_decorator(exporter: InMemorySpanExporter, tracer_provider: TracerProvider) -> None:
     # Arrange
-    @span_decorator(span_name="test", attributes={"test": "test"}, tracer=tracer_provider.get_tracer(__name__))
+    @span_decorator(name="test", attributes={"test": "test"}, tracer=tracer_provider.get_tracer(__name__))
     async def action() -> None:
         await asyncio.sleep(0.01)