Merge branch 'main' into anshul-fix-1781-alt

Author: saichander17

CHANGELOG.md

@@ -24,13 +24,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `opentelemetry-instrumentation-aiokafka` Wrap `AIOKafkaConsumer.getone()` instead of `AIOKafkaConsumer.__anext__`
   ([#2874](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2874))
+- `opentelemetry-instrumentation-confluent-kafka` Fix to allow `topic` to be extracted from `kwargs` in `produce()` 
+  ([#2901])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2901)
+
+### Breaking changes
+
+- Deprecation of pkg_resource in favor of importlib.metadata
+  ([#2871](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2871))
 
 ## Version 1.27.0/0.48b0 (2024-08-28)
 
 ### Added
 
-- `opentelemetry-instrumentation-kafka-python` Instrument temporary fork, kafka-python-ng
-  inside kafka-python's instrumentation
+- `opentelemetry-instrumentation-kafka-python` Instrument temporary fork, kafka-python-ng inside kafka-python's instrumentation
   ([#2537](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2537))
 - `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-fastapi` Add ability to disable internal HTTP send and receive spans
   ([#2802](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2802))

exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

@@ -6,7 +6,6 @@ cramjam==2.1.0; platform_python_implementation == "PyPy"
 cramjam==2.8.1; platform_python_implementation != "PyPy"
 Deprecated==1.2.14
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

exporter/opentelemetry-exporter-richconsole/test-requirements.txt

@@ -1,7 +1,6 @@
 asgiref==3.8.1
 Deprecated==1.2.14
 flaky==3.7.0
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 markdown-it-py==3.0.0
 mdurl==0.1.2

instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt

@@ -3,7 +3,6 @@ aiormq==6.2.3
 asgiref==3.8.1
 Deprecated==1.2.14
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
 packaging==24.0

instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt

@@ -3,7 +3,6 @@ aiormq==6.6.4
 asgiref==3.8.1
 Deprecated==1.2.14
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
 packaging==24.0

instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt

@@ -3,7 +3,6 @@ aiormq==6.7.1
 asgiref==3.8.1
 Deprecated==1.2.14
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
 packaging==24.0

instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt

@@ -3,7 +3,6 @@ aiormq==6.8.0
 asgiref==3.8.1
 Deprecated==1.2.14
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
 packaging==24.0

instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt

@@ -11,7 +11,6 @@ Flask==3.0.2
 frozenlist==1.4.1
 http_server_mock==1.7
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 itsdangerous==2.1.2
 Jinja2==3.1.4

instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py

@@ -24,7 +24,6 @@
 import aiohttp.test_utils
 import yarl
 from http_server_mock import HttpServerMock
-from pkg_resources import iter_entry_points
 
 from opentelemetry import trace as trace_api
 from opentelemetry.instrumentation import aiohttp_client
@@ -47,6 +46,7 @@
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import Span, StatusCode
+from opentelemetry.util._importlib_metadata import entry_points
 
 
 def run_with_test_server(
@@ -886,9 +886,9 @@ def response_hook(
 
 class TestLoadingAioHttpInstrumentor(unittest.TestCase):
     def test_loading_instrumentor(self):
-        entry_points = iter_entry_points(
-            "opentelemetry_instrumentor", "aiohttp-client"
+        (entry_point,) = entry_points(
+            group="opentelemetry_instrumentor", name="aiohttp-client"
         )
 
-        instrumentor = next(entry_points).load()()
+        instrumentor = entry_point.load()()
         self.assertIsInstance(instrumentor, AioHttpClientInstrumentor)

instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt

@@ -5,7 +5,6 @@ async-timeout==4.0.3
 Deprecated==1.2.14
 frozenlist==1.4.1
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
 packaging==24.0