address copilot comments

Author: herin049

.changelog/5672.added

@@ -1 +1 @@
-`opentelemetry-sdk`: align resource detector schema url conflict behavor with other languages
+`opentelemetry-sdk`: align resource detector schema url conflict behavior with other languages

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

@@ -258,10 +258,17 @@ def merge(self, other: "Resource") -> "Resource":
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, Resource):
             return False
-        return self._attributes == other._attributes and self._schema_url == other._schema_url
+        return (
+            self._attributes == other._attributes
+            and self._schema_url == other._schema_url
+            and self._schema_url_conflict == other._schema_url_conflict
+        )
 
     def __hash__(self) -> int:
-        return hash(f"{dumps(self._attributes.copy(), sort_keys=True, default=_json_default)}|{self._schema_url}")
+        return hash(
+            f"{dumps(self._attributes.copy(), sort_keys=True, default=_json_default)}"
+            f"|{self._schema_url}|{self._schema_url_conflict}"
+        )
 
     def to_json(self, indent: int | None = 4) -> str:
         return dumps(

opentelemetry-sdk/tests/resources/test_resources.py

@@ -190,11 +190,14 @@ def test_resource_merge(self):
         right = Resource.create({}, schema_urls[0])
         self.assertEqual(left.merge(right).schema_url, schema_urls[0])
 
-        left = Resource.create({}, schema_urls[0])
-        right = Resource.create({}, schema_urls[1])
+        left = Resource({"a": "left", "shared": "left"}, schema_urls[0])
+        right = Resource({"b": "right", "shared": "right"}, schema_urls[1])
         with self.assertLogs(level=WARNING) as log_entry:
             merged = left.merge(right)
-            self.assertEqual(merged.attributes, left.attributes)
+            self.assertEqual(
+                merged.attributes,
+                {"a": "left", "b": "right", "shared": "right"},
+            )
             self.assertEqual(merged.schema_url, "")
             self.assertIn(schema_urls[0], log_entry.output[0])
             self.assertIn(schema_urls[1], log_entry.output[0])
@@ -207,6 +210,26 @@ def test_resource_merge(self):
         fourth = Resource.create({}, None)
         self.assertEqual(merged.merge(fourth).schema_url, "")
 
+    def test_conflict_eq_hash(self):
+        left = Resource({"a": "1"}, "https://opentelemetry.io/schemas/1.2.0")
+        right = Resource({"a": "1"}, "https://opentelemetry.io/schemas/1.3.0")
+        with self.assertLogs(level=WARNING):
+            cleared = left.merge(right)
+            cleared_again = left.merge(right)
+
+        cases = (
+            ("cleared vs plain", cleared, Resource({"a": "1"}), False),
+            ("cleared vs cleared", cleared, cleared_again, True),
+        )
+        for name, first, second, expected in cases:
+            with self.subTest(name):
+                for check, actual in (
+                    ("eq", first == second),
+                    ("hash", hash(first) == hash(second)),
+                ):
+                    with self.subTest(check):
+                        self.assertEqual(actual, expected)
+
     def test_resource_merge_empty_string(self):
         """Verify Resource.merge behavior with the empty string.