Merge branch 'main' into disable-click-for-webservers

Author: xrmx

CHANGELOG.md

@@ -34,6 +34,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3105](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3105))
 - `opentelemetry-instrumentation-click` Disable tracing of well-known server click commands
   ([#3174](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3174))
+- `opentelemetry-instrumentation` Fix `get_dist_dependency_conflicts` if no distribution requires
+  ([#3168](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3168))
 
 
 ## Version 1.29.0/0.50b0 (2024-12-11)

opentelemetry-instrumentation/src/opentelemetry/instrumentation/dependencies.py

@@ -47,13 +47,14 @@ def get_dist_dependency_conflicts(
     extra = "extra"
     instruments = "instruments"
     instruments_marker = {extra: instruments}
-    for dep in dist.requires:
-        if extra not in dep or instruments not in dep:
-            continue
-
-        req = Requirement(dep)
-        if req.marker.evaluate(instruments_marker):
-            instrumentation_deps.append(req)
+    if dist.requires:
+        for dep in dist.requires:
+            if extra not in dep or instruments not in dep:
+                continue
+
+            req = Requirement(dep)
+            if req.marker.evaluate(instruments_marker):
+                instrumentation_deps.append(req)
 
     return get_dependency_conflicts(instrumentation_deps)
 

opentelemetry-instrumentation/tests/test_dependencies.py

@@ -86,3 +86,19 @@ def requires(self):
             str(conflict),
             'DependencyConflict: requested: "test-pkg~=1.0; extra == "instruments"" but found: "None"',
         )
+
+    def test_get_dist_dependency_conflicts_requires_none(self):
+        class MockDistribution(Distribution):
+            def locate_file(self, path):
+                pass
+
+            def read_text(self, filename):
+                pass
+
+            @property
+            def requires(self):
+                return None
+
+        dist = MockDistribution()
+        conflict = get_dist_dependency_conflicts(dist)
+        self.assertTrue(conflict is None)