Merge branch 'main' into sqlalchemy-db-statement-comment-opt-in

tammy-baylis-swi · Dec 18, 2024 · cc371a8 · cc371a8
2 parents 63c5f12 + 52ff7bd
commit cc371a8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `opentelemetry-instrumentation-confluent-kafka` Add support for confluent-kafka <=2.7.0
+  ([#3100](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3100))
 - Add support to database stability opt-in in `_semconv` utilities and add tests
   ([#3111](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3111))
 

diff --git a/instrumentation/README.md b/instrumentation/README.md
@@ -16,7 +16,7 @@
 | [opentelemetry-instrumentation-cassandra](./opentelemetry-instrumentation-cassandra) | cassandra-driver ~= 3.25,scylla-driver ~= 3.25 | No | experimental
 | [opentelemetry-instrumentation-celery](./opentelemetry-instrumentation-celery) | celery >= 4.0, < 6.0 | No | experimental
 | [opentelemetry-instrumentation-click](./opentelemetry-instrumentation-click) | click >= 8.1.3, < 9.0.0 | No | experimental
-| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, <= 2.4.0 | No | experimental
+| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, <= 2.7.0 | No | experimental
 | [opentelemetry-instrumentation-dbapi](./opentelemetry-instrumentation-dbapi) | dbapi | No | experimental
 | [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 1.10 | Yes | experimental
 | [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 6.0 | No | experimental

diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml b/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
@@ -32,7 +32,7 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "confluent-kafka >= 1.8.2, <= 2.4.0",
+  "confluent-kafka >= 1.8.2, <= 2.7.0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

diff --git a/...trumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/package.py b/...trumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/package.py
@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = ("confluent-kafka >= 1.8.2, <= 2.4.0",)
+_instruments = ("confluent-kafka >= 1.8.2, <= 2.7.0",)
diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
@@ -1,5 +1,5 @@
 asgiref==3.8.1
-confluent-kafka==2.4.0
+confluent-kafka==2.6.1
 Deprecated==1.2.14
 iniconfig==2.0.0
 packaging==24.0

diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
@@ -77,7 +77,7 @@
         "instrumentation": "opentelemetry-instrumentation-click==0.51b0.dev",
     },
     {
-        "library": "confluent-kafka >= 1.8.2, <= 2.4.0",
+        "library": "confluent-kafka >= 1.8.2, <= 2.7.0",
         "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.51b0.dev",
     },
     {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@
		# limitations under the License.


		_instruments = ("confluent-kafka >= 1.8.2, <= 2.4.0",)
		_instruments = ("confluent-kafka >= 1.8.2, <= 2.7.0",)