Make scope matcher generic per Lukas suggestion

Author: xrmx

opentelemetry-sdk/benchmarks/trace/test_benchmark_trace.py

@@ -21,7 +21,7 @@
     TracerProvider,
     _default_tracer_configurator,
     _RuleBasedTracerConfigurator,
-    _tracer_name_matches_glob,
+    _scope_name_matches_glob,
     _TracerConfig,
     sampling,
 )
@@ -73,7 +73,7 @@ def tracer_configurator(tracer_scope):
         return _RuleBasedTracerConfigurator(
             rules=[
                 (
-                    _tracer_name_matches_glob(glob_pattern=str(i)),
+                    _scope_name_matches_glob(glob_pattern=str(i)),
                     _TracerConfig(is_enabled=True),
                 )
                 for i in range(num_tracer_configurator_rules)

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

@@ -1240,17 +1240,18 @@ def start_span(  # pylint: disable=too-many-locals
 
 
 _TracerConfiguratorT = Callable[[InstrumentationScope], _TracerConfig]
-_TracerConfiguratorRulesPredicateT = Callable[[InstrumentationScope], bool]
+_InstrumentationScopePredicateT = Callable[[InstrumentationScope], bool]
 _TracerConfiguratorRulesT = Sequence[
-    tuple[_TracerConfiguratorRulesPredicateT, _TracerConfig]
+    tuple[_InstrumentationScopePredicateT, _TracerConfig]
 ]
 
 
-def _tracer_name_matches_glob(
+# TODO: share this with configurators for other signals
+def _scope_name_matches_glob(
     glob_pattern: str,
-) -> _TracerConfiguratorRulesPredicateT:
-    def inner(tracer_scope: InstrumentationScope) -> bool:
-        return fnmatch.fnmatch(tracer_scope.name, glob_pattern)
+) -> _InstrumentationScopePredicateT:
+    def inner(scope: InstrumentationScope) -> bool:
+        return fnmatch.fnmatch(scope.name, glob_pattern)
 
     return inner
 

opentelemetry-sdk/tests/trace/test_trace.py

@@ -47,7 +47,7 @@
     Resource,
     TracerProvider,
     _RuleBasedTracerConfigurator,
-    _tracer_name_matches_glob,
+    _scope_name_matches_glob,
     _TracerConfig,
 )
 from opentelemetry.sdk.trace.id_generator import RandomIdGenerator
@@ -2236,11 +2236,11 @@ def test_rule_based_tracer_configurator(self):
         # pylint: disable=protected-access
         rules = [
             (
-                _tracer_name_matches_glob(glob_pattern="module_name"),
+                _scope_name_matches_glob(glob_pattern="module_name"),
                 _TracerConfig(is_enabled=True),
             ),
             (
-                _tracer_name_matches_glob(glob_pattern="other_module_name"),
+                _scope_name_matches_glob(glob_pattern="other_module_name"),
                 _TracerConfig(is_enabled=False),
             ),
         ]
@@ -2282,7 +2282,7 @@ def test_rule_based_tracer_configurator_default_when_rules_dont_match(
         # pylint: disable=protected-access
         rules = [
             (
-                _tracer_name_matches_glob(glob_pattern="module_name"),
+                _scope_name_matches_glob(glob_pattern="module_name"),
                 _TracerConfig(is_enabled=False),
             ),
         ]