lint

Author: jeremydvoss

opentelemetry-sdk/src/opentelemetry/sdk/trace/sampling.py

@@ -422,26 +422,22 @@ def _get_from_env_or_default() -> Sampler:
                 rate = 1.0
             return _KNOWN_SAMPLERS[trace_sampler_name](rate)
         return _KNOWN_SAMPLERS[trace_sampler_name]
-    else:
-        try:
-            trace_sampler_factory = _import_sampler_factory(trace_sampler_name)
-            sampler_arg = os.getenv(OTEL_TRACES_SAMPLER_ARG, "")
-            trace_sampler = trace_sampler_factory(sampler_arg)
-            if not isinstance(trace_sampler, Sampler):
-                message = (
-                    "Output of traces sampler factory, %s, was not a Sampler object."
-                    % trace_sampler_factory
-                )
-                _logger.warning(message)
-                raise ValueError(message)
-            return trace_sampler
-        except Exception as exc:
-            _logger.warning(
-                "Using default sampler. Failed to initialize custom sampler, %s: %s",
-                trace_sampler_name,
-                exc,
-            )
-            return _KNOWN_SAMPLERS["parentbased_always_on"]
+    try:
+        trace_sampler_factory = _import_sampler_factory(trace_sampler_name)
+        sampler_arg = os.getenv(OTEL_TRACES_SAMPLER_ARG, "")
+        trace_sampler = trace_sampler_factory(sampler_arg)
+        if not isinstance(trace_sampler, Sampler):
+            message = f"Output of traces sampler factory, {trace_sampler_factory}, was not a Sampler object."
+            _logger.warning(message)
+            raise ValueError(message)
+        return trace_sampler
+    except Exception as exc:  # pylint: disable=broad-except
+        _logger.warning(
+            "Using default sampler. Failed to initialize custom sampler, %s: %s",
+            trace_sampler_name,
+            exc,
+        )
+        return _KNOWN_SAMPLERS["parentbased_always_on"]
 
 
 def _get_parent_trace_state(parent_context) -> Optional["TraceState"]:

opentelemetry-sdk/tests/trace/test_trace.py

@@ -141,10 +141,10 @@ def test_tracer_provider_accepts_concurrent_multi_span_processor(self):
 
 class CustomSampler(sampling.Sampler):
     def __init__(self) -> None:
-        super().__init__()
+        pass
 
     def get_description(self) -> str:
-        return super().get_description()
+        return "CustomSampler"
 
     def should_sample(
         self,
@@ -156,15 +156,7 @@ def should_sample(
         links,
         trace_state,
     ):
-        return super().should_sample(
-            parent_context,
-            trace_id,
-            name,
-            kind,
-            attributes,
-            links,
-            trace_state,
-        )
+        return True
 
 
 class CustomRatioSampler(sampling.TraceIdRatioBased):
@@ -173,7 +165,7 @@ def __init__(self, ratio):
         super().__init__(ratio)
 
     def get_description(self) -> str:
-        return super().get_description()
+        return "CustomSampler"
 
     def should_sample(
         self,
@@ -185,15 +177,7 @@ def should_sample(
         links,
         trace_state,
     ):
-        return super().should_sample(
-            parent_context,
-            trace_id,
-            name,
-            kind,
-            attributes,
-            links,
-            trace_state,
-        )
+        return True
 
 
 class CustomSamplerFactory: