fix: use (name, subtype) tuple as component key in DeprecationDetector

ecosystem-automation/collector-watcher/src/collector_watcher/deprecation_detector.py

@@ -52,11 +52,11 @@ def detect_deprecated(
             previous_set = self._build_component_set(previous_components.get(component_type, []))
             current_set = self._build_component_set(current_components.get(component_type, []))
 
-            removed_names = previous_set - current_set
+            removed_keys = previous_set - current_set
 
             deprecated_list = []
             for component in previous_components.get(component_type, []):
-                if component["name"] in removed_names:
+                if (component["name"], component.get("subtype")) in removed_keys:
                     deprecated_component = self._create_deprecated_component(
                         component, previous_version, current_version
                     )
@@ -67,9 +67,9 @@ def detect_deprecated(
         return deprecated_components
 
     @staticmethod
-    def _build_component_set(components: list[dict[str, Any]]) -> set[str]:
-        """Build a set of component names."""
-        return {component["name"] for component in components}
+    def _build_component_set(components: list[dict[str, Any]]) -> set[tuple[str, str | None]]:
+        """Build a set of (name, subtype) tuples to uniquely identify components."""
+        return {(component["name"], component.get("subtype")) for component in components}
 
     @staticmethod
     def _create_deprecated_component(

ecosystem-automation/collector-watcher/tests/test_deprecation_detector.py

@@ -252,3 +252,97 @@ def test_create_deprecated_component(detector, previous_version, current_version
     assert deprecated["source_repo"] == "core"
     assert deprecated["distributions"] == ["core"]
     assert deprecated["subtype"] is None
+
+
+def test_detect_deprecated_subtype_removal(detector, previous_version, current_version):
+    """A component removed from one subtype should be detected even if the same
+    name still exists under a different subtype."""
+    previous = {
+        "receiver": [],
+        "processor": [],
+        "exporter": [],
+        "connector": [],
+        "extension": [
+            {
+                "name": "zipkin",
+                "source_repo": "contrib",
+                "distributions": ["contrib"],
+                "subtype": "encoding",
+            },
+            {
+                "name": "zipkin",
+                "source_repo": "contrib",
+                "distributions": ["contrib"],
+                "subtype": "storage",
+            },
+        ],
+    }
+
+    current = {
+        "receiver": [],
+        "processor": [],
+        "exporter": [],
+        "connector": [],
+        "extension": [
+            {
+                "name": "zipkin",
+                "source_repo": "contrib",
+                "distributions": ["contrib"],
+                "subtype": "storage",
+            },
+        ],
+    }
+
+    deprecated = detector.detect_deprecated(
+        previous_version=previous_version,
+        previous_components=previous,
+        current_version=current_version,
+        current_components=current,
+    )
+
+    assert len(deprecated["extension"]) == 1
+    assert deprecated["extension"][0]["name"] == "zipkin"
+    assert deprecated["extension"][0]["subtype"] == "encoding"
+
+
+def test_detect_deprecated_same_name_different_subtype_no_false_positive(detector, previous_version, current_version):
+    """When a component exists under the same name but its subtype changes,
+    only the removed subtype entry should be flagged, not the surviving one."""
+    previous = {
+        "receiver": [],
+        "processor": [],
+        "exporter": [],
+        "connector": [],
+        "extension": [
+            {
+                "name": "otlp",
+                "source_repo": "core",
+                "distributions": ["core"],
+                "subtype": "encoding",
+            },
+        ],
+    }
+
+    current = {
+        "receiver": [],
+        "processor": [],
+        "exporter": [],
+        "connector": [],
+        "extension": [
+            {
+                "name": "otlp",
+                "source_repo": "core",
+                "distributions": ["core"],
+                "subtype": "encoding",
+            },
+        ],
+    }
+
+    deprecated = detector.detect_deprecated(
+        previous_version=previous_version,
+        previous_components=previous,
+        current_version=current_version,
+        current_components=current,
+    )
+
+    assert len(deprecated["extension"]) == 0