Instrument newer versions (#1468)

CHANGELOG.md

@@ -30,6 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1409](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1409))
 - Strip leading comments from SQL queries when generating the span name.
   ([#1434](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1434))
+- `opentelemetry-instrumentation-confluent-kafka` Add support for the latest versions of the library.
+  ([#1468](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1468))
 
 ### Fixed
 

instrumentation/README.md

@@ -11,7 +11,7 @@
 | [opentelemetry-instrumentation-boto3sqs](./opentelemetry-instrumentation-boto3sqs) | boto3 ~= 1.0 | No
 | [opentelemetry-instrumentation-botocore](./opentelemetry-instrumentation-botocore) | botocore ~= 1.0 | No
 | [opentelemetry-instrumentation-celery](./opentelemetry-instrumentation-celery) | celery >= 4.0, < 6.0 | No
-| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka ~= 1.8.2 | No
+| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, < 2.0.0 | No
 | [opentelemetry-instrumentation-dbapi](./opentelemetry-instrumentation-dbapi) | dbapi | No
 | [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 1.10 | Yes
 | [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 2.0 | No

instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "confluent-kafka ~= 1.8.2",
+  "confluent-kafka >= 1.8.2, < 2.0.0",
 ]
 test = [
   "opentelemetry-instrumentation-confluent-kafka[instruments]",

instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/package.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = ("confluent-kafka ~= 1.8.2",)
+_instruments = ("confluent-kafka >= 1.8.2, < 2.0.0",)

opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py

@@ -53,7 +53,7 @@ libraries = {
         "instrumentation": "opentelemetry-instrumentation-celery==0.36b0.dev",
     },
     "confluent-kafka": {
-        "library": "confluent-kafka ~= 1.8.2",
+        "library": "confluent-kafka >= 1.8.2, < 2.0.0",
         "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.36b0.dev",
     },
     "django": {

tox.ini

@@ -207,6 +207,10 @@ envlist =
     py3{7,8,9,10,11}-test-instrumentation-kafka-python
     pypy3-test-instrumentation-kafka-python
 
+    ; opentelemetry-instrumentation-confluent-kafka
+    // FIXME: Enable support for python 3.11 when https://github.com/confluentinc/confluent-kafka-python/issues/1452 is fixed
+    py3{7,8,9,10}-test-instrumentation-confluent-kafka
+
     lint
     spellcheck
     docker-tests
@@ -284,6 +288,7 @@ changedir =
   test-instrumentation-grpc: instrumentation/opentelemetry-instrumentation-grpc/tests
   test-instrumentation-jinja2: instrumentation/opentelemetry-instrumentation-jinja2/tests
   test-instrumentation-kafka-python: instrumentation/opentelemetry-instrumentation-kafka-python/tests
+  test-instrumentation-confluent-kafka: instrumentation/opentelemetry-instrumentation-confluent-kafka/tests
   test-instrumentation-logging: instrumentation/opentelemetry-instrumentation-logging/tests
   test-instrumentation-mysql: instrumentation/opentelemetry-instrumentation-mysql/tests
   test-instrumentation-pika{0,1}: instrumentation/opentelemetry-instrumentation-pika/tests
@@ -330,6 +335,8 @@ commands_pre =
 
   kafka-python: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python[test]
 
+  confluent-kafka: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
+
   grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
 
   falcon{1,2,3},flask,django{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,requests,urllib,urllib3,wsgi: pip install {toxinidir}/util/opentelemetry-util-http[test]
@@ -492,6 +499,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python[test]
+  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
@@ -556,6 +564,7 @@ commands_pre =
               -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery \
               -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika \
               -e {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python \
+              -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka \
               -e {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi \
               -e {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql \
               -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2 \