Code cleanup

Author: bhogayatakb

middleware/__init__.py

@@ -1,11 +1,5 @@
 from middleware.distro import mw_tracker, custom_record_exception_wrapper
-from typing import Collection
-import sys
-import threading
-from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
-from opentelemetry import trace
 from opentelemetry.sdk.trace import Span
-from typing import Optional
 from middleware.options import (
     MWOptions,
     DETECT_AWS_BEANSTALK,
@@ -36,5 +30,4 @@
     "DETECT_ENVVARS",
 ]
 
-tracer = trace.get_tracer(__name__)
 Span.record_exception = custom_record_exception_wrapper

middleware/distro.py

@@ -13,7 +13,8 @@
 from middleware.log import create_logger_handler
 from middleware.profiler import collect_profiling
 from opentelemetry import trace
-from opentelemetry.trace import Tracer, get_current_span, get_tracer, Span, get_tracer, Status, StatusCode
+from opentelemetry.trace import Tracer, get_current_span, get_tracer, get_tracer, Status, StatusCode
+from opentelemetry.sdk.trace import Span
 import os
 import json
 
@@ -86,6 +87,39 @@ def mw_tracker(
 
     mw_tracker_called = True
 
+def record_exception(exc: Exception, span_name: Optional[str] = None) -> None:
+    """
+    Reports an exception as a span event creating a dummy span if necessary.
+
+    Args:
+        exc (Exception): Pass Exception to record as in a current span.
+        span_name (String,Optional): Span Name to use if no current span found,
+                                     defaults to Exception Name.
+
+    Example
+    --------
+    >>> from middleware import record_exception
+    >>> try:
+    >>>     print("Divide by zero:",1/0)
+    >>> except Exception as e:
+    >>>     record_exception(e)
+
+    """
+
+    span = get_current_span()
+    if span.is_recording():
+        span.record_exception(exc)
+        return
+
+    tracer: Tracer = get_tracer("mw-tracer")
+    if span_name is None:
+        span_name = type(exc).__name__
+
+    span = tracer.start_span(span_name)
+    span.record_exception(exc)
+    span.set_status(trace.Status(trace.StatusCode.ERROR, str(exc)))
+    span.end()
+
 def extract_function_code(tb_frame, lineno):
     """Extracts the full function body where the exception occurred."""
     try:

middleware/trace.py

@@ -77,7 +77,7 @@ def create_tracer_provider(options: MWOptions, resource: Resource) -> TracerProv
             exporter,
         )
     )
-    # trace_provider.add_span_processor(ExceptionFilteringSpanProcessor())
+    trace_provider.add_span_processor(ExceptionFilteringSpanProcessor())
     if options.console_exporter:
         output = sys.stdout
         if options.debug_log_file:

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "middleware-io"
-version = "2.1.2rc14"
+version = "2.1.2rc15"
 requires-python = ">=3.8"
 description = "Middleware's APM tool enables Python developers to effortlessly monitor their applications, gathering distributed tracing, metrics, logs, and profiling data for valuable insights and performance optimization."
 authors = [{ name = "middleware-dev" }]