address review feedback: simplify resource filter and propagator loading

Assisted-by: Claude Sonnet 4.6

Author: MikeGoldsmith

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/_propagator.py

@@ -36,13 +36,13 @@
 def _load_entry_point_propagator(name: str) -> TextMapPropagator:
     """Load a propagator by name from the opentelemetry_propagator entry point group."""
     try:
-        eps = list(entry_points(group="opentelemetry_propagator", name=name))
-        if not eps:
+        ep = next(entry_points(group="opentelemetry_propagator", name=name), None)
+        if not ep:
             raise ConfigurationError(
                 f"Propagator '{name}' not found. "
                 "It may not be installed or may be misspelled."
             )
-        return eps[0].load()()
+        return ep.load()()
     except ConfigurationError:
         raise
     except Exception as exc:
@@ -85,29 +85,24 @@ def create_propagator(
     if config is None:
         return CompositePropagator([])
 
-    propagators: list[TextMapPropagator] = []
-    seen_types: set[type] = set()
-
-    def _add_deduped(propagator: TextMapPropagator) -> None:
-        if type(propagator) not in seen_types:
-            seen_types.add(type(propagator))
-            propagators.append(propagator)
+    propagators: dict[type[TextMapPropagator], TextMapPropagator] = {}
 
     # Process structured composite list
     if config.composite:
         for entry in config.composite:
             for propagator in _propagators_from_textmap_config(entry):
-                _add_deduped(propagator)
+                propagators.setdefault(type(propagator), propagator)
 
     # Process composite_list (comma-separated propagator names via entry_points)
     if config.composite_list:
         for name in config.composite_list.split(","):
             name = name.strip()
             if not name or name.lower() == "none":
                 continue
-            _add_deduped(_load_entry_point_propagator(name))
+            propagator = _load_entry_point_propagator(name)
+            propagators.setdefault(type(propagator), propagator)
 
-    return CompositePropagator(propagators)
+    return CompositePropagator(list(propagators.values()))
 
 
 def configure_propagator(config: Optional[PropagatorConfig]) -> None:

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/_resource.py

@@ -170,12 +170,10 @@ def _filter_attributes(
     if not included and not excluded:
         return attrs
 
-    effective_included = included if included else None  # [] → include all
-
     result: dict[str, object] = {}
     for key, value in attrs.items():
-        if effective_included is not None and not any(
-            fnmatch.fnmatch(key, pat) for pat in effective_included
+        if included and not any(
+            fnmatch.fnmatch(key, pat) for pat in included
         ):
             continue
         if excluded and any(fnmatch.fnmatch(key, pat) for pat in excluded):